From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 25 Aug 2011 22:38:52 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~2464^2~2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=983a60297d1ded9e594f94127f6064764d853d34;p=emacs.git

Merge from trunk.
---

983a60297d1ded9e594f94127f6064764d853d34